feat(marcode): merge upstream (t3code april 2026) and remove todo feature#43
Closed
tyulyukov wants to merge 61 commits into
Closed
feat(marcode): merge upstream (t3code april 2026) and remove todo feature#43tyulyukov wants to merge 61 commits into
tyulyukov wants to merge 61 commits into
Conversation
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: julius <julius0216@outlook.com>
Co-authored-by: Cursor Agent <cursoragent@cursor.com> Co-authored-by: cursor[bot] <206951365+cursor[bot]@users.noreply.github.com> Co-authored-by: codex <codex@users.noreply.github.com>
…ingdotgg#1995) Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Julius Marminge <jmarminge@gmail.com>
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: Cursor Agent <cursoragent@cursor.com> Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Cursor Agent <cursoragent@cursor.com> Co-authored-by: cursor[bot] <206951365+cursor[bot]@users.noreply.github.com>
…tgg#2004) Co-authored-by: Cursor Agent <cursoragent@cursor.com>
…ingdotgg#1541) Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gg#2049) Co-authored-by: codex <codex@users.noreply.github.com> Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…lan sidebar responsive) (pingdotgg#1198)
…en model selection (pingdotgg#2076)
Co-authored-by: tlh38 <tlh38@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: codex <codex@users.noreply.github.com>
…e session monitoring. (pingdotgg#2042) Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Absorbed 59 new upstream commits since PR #42 (HEAD 7e1430b..f297e30), including node-native TS, Windows/Linux titlebar overlay, configurable project grouping, Opus 4.7 model metadata, filesystem browse API, Claude session reaper, thread shell summary projections, nightly release channel, latest-user-message timestamps, coalesced status refreshes, tooltip on file mentions, terminal Cmd+Backspace, shell snapshot queries, Windows ARM builds, Kiro editor, Blacksmith CI, and version bumps. Rejected upstream commits (contradict MarCode CSS content-visibility scrolling approach): - 96c9306 Migrate chat scrolling to LegendList - 33dadb5 Thread timeline autoscroll fix (depends on LegendList) Hand-merged to preserve MarCode invariants: - 8dba2d6 tsdown migration: re-added __EMBEDDED_MARCODE_JIRA_REDIRECT_URI__ and __EMBEDDED_MARCODE_JIRA_TOKEN_PROXY_URL__ defines + backendChildEnv injection - dff8784 titlebar overlay: preserved FULLSCREEN_STATE_CHANNEL, windowState.ts persistence, SidebarChromeHeader fullscreen-aware logo padding - 188a40c sidebar grouping: preserved SidebarChromeHeader customizations - 3e07f5a Opus 4.7 metadata: deduped against our earlier 18216a5 - store.ts: preserved incremental event handlers (thread.message-sent/activity-appended/session-set/turn-diff-completed/ proposed-plan-upserted) and structural-sharing logic while accepting upstream's EnvironmentState refactor Kept HEAD's GitCore upstream refresh cache (targeted ref fetch keyed by gitCommonDir+upstreamRef+remoteName+upstreamBranch) over upstream's remote-only coalescing variant — the simpler remote-level key caused 20s+ timeouts in synthetic alias tests using real github.com URLs. Verification: - pnpm typecheck clean across all 7 packages - 2232 tests passing (69 contracts, 106 desktop, 5 client-runtime, 107 shared, 52 scripts, 1025 web, 868 server) - Desktop + web builds green - __EMBEDDED_MARCODE_JIRA_* defines verified present in apps/desktop/dist-electron/main.cjs bundle - All 5 regression guards pass (store, notification wiring, work cards, jira chip, window state) Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
- Remove todo checklist feature from UI, settings, and session logic - Improve folder selection in attachments via command palette - Fix shell hydration state preservation during mid-turn updates - Update backend readiness check to use /api/auth/session endpoint - Preserve MarCode branding throughout merge - Simplify compact composer controls menu
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Testing
applyRecoveredEventBatchcallsdispatchTurnNotifications)~/.marcode/userdata/window-state.json